clippy: make tests work in stage 1 #144027
Open
+71
−45
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
rustbot has assigned @Mark-Simulacrum. Use |
rustbot
added
A-testsuite
|
Some changes occurred in src/tools/clippy cc @rust-lang/clippy |
RalfJung
commented
Jul 16, 2025
RalfJung
commented
Jul 16, 2025
RalfJung
force-pushed
the
clippy
branch
3 times, most recently
from
210e667 to
ec30b29
Compare
flip1995
reviewed
Jul 16, 2025
RalfJung
commented
Jul 16, 2025
| // set `--sysroot`, so we need to use bootstrap's rustc wrapper. That wrapper | ||
| // however has some staging logic that is hurting us here, so to work around | ||
| // that we set both the "real" and "staging" rustc to TEST_RUSTC, including the | ||
| // associated library paths. |
There was a problem hiding this comment.
It should be possible to use a different approach here... somehow, aux builds are working for clippy tests. It seems to be using clippy itself as the compiler for that, and that's somehow okay? So, we could try to do the same here, instead of all this TEST_RUSTC stuff. (That would also be closer to what Miri does.)
But TBH I found something that works so I am not overly inclined to debug a different approach. ;)
|
FWIW, I have a WIP branch (there are so many stacked changes to bootstrap that I'm doing rn that it takes a while to unload) where I refactor the building of tools, so that the correct compiler should always be chosen, and we don't need to do this careful dance for each tool and bootstrap Step separately. Essentially we'd invert the compiler "flow" in the tool, so that we pass it the build compiler instead of figuring it out from the tool, and also hopefully we'll be able to get rid of the implicit rmeta/rlib copy into the build compiler's sysroot and make that explicit. Anyway, I'm fine with this specific fix if it helps the stage 1 Clippy tests in the meantime (it seems like there are some other blockers in the tests themselves, which can be resolved in parallel), just wanted to note that hopefully soonish this will all be unified away so that we always do The Right Thing™. |
|
@bors r+ rollup=iffy |
bors
added
S-waiting-on-bors
bors
added a commit
that referenced
this pull request
Jul 20, 2025
clippy: make tests work in stage 1 This finally fixes #78717 :) Similar to what Miri already does, the clippy test step needs to carefully consider which compiler is used to build clippy and which compiler is linked into clippy (and thus must be used to build the test dependencies). On top of that we have some extra complications that Miri avoided by using `cargo-miri` for building its test dependencies: we need cargo to use the right rustc and the right sysroot, but rust-lang/cargo#4423 makes this quite hard to do. See the long comment in `src/tools/clippy/tests/compile-test.rs` for details. Some clippy tests tried to import rustc crates; that fundamentally requires a full bootstrap loop so it cannot work in stage 1. I had to kind of guess what those tests were doing so I don't know if my changes there make any sense. Cc `@flip1995` `@Kobzol`
|
The job Click to see the possible cause of the failure (guessed by this bot) |
|
💔 Test failed - checks-actions |
bors
removed
the
S-waiting-on-bors
bors
added
the
S-waiting-on-review
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This finally fixes #78717 :)
Similar to what Miri already does, the clippy test step needs to carefully consider which compiler is used to build clippy and which compiler is linked into clippy (and thus must be used to build the test dependencies). On top of that we have some extra complications that Miri avoided by using
cargo-mirifor building its test dependencies: we need cargo to use the right rustc and the right sysroot, but rust-lang/cargo#4423 makes this quite hard to do. See the long comment insrc/tools/clippy/tests/compile-test.rsfor details.Some clippy tests tried to import rustc crates; that fundamentally requires a full bootstrap loop so it cannot work in stage 1. I had to kind of guess what those tests were doing so I don't know if my changes there make any sense.
Cc @flip1995 @Kobzol